--- a/example/Biharmonic.m	Sat Aug 03 14:47:03 2013 +0200
+++ b/example/Biharmonic.m	Sat Aug 03 14:48:23 2013 +0200
@@ -9,20 +9,20 @@
 msho = msh2m_structured_mesh (x, y, 1, 1:4);
 mshd = fem_init_mesh (msho);
 
-V  = fem_fs_Biharmonic (mshd);
+V  = Biharmonic_FunctionSpace (mshd);
 
-bc = fem_bc (V, @(x,y) 0, 1:4);
+bc = DirichletBC (V, @(x,y) 0, 1:4);
  
 
-f = fem_coeff ('f', @(x,y) 4.0*pi^4.*sin(pi.*x).*sin(pi.*y));
+f = Expression ('f', @(x,y) 4.0*pi^4.*sin(pi.*x).*sin(pi.*y));
 
-g = fem_coeff ('alpha', @(x,y) 8);
+g = Expression ('alpha', @(x,y) 8);
 
-A = fem_rhs_Biharmonic (V, bc, g);
-b = fem_lhs_Biharmonic (V, bc, f );
+A = Biharmonic_BilinearForm (V, bc, g);
+b = Biharmonic_LinearForm (V, bc, f );
 
 u = A \ b;
 
 
-func = fem_func ('u', V, u);
+func = Function ('u', V, u);
 fem_plot (func);