--- a/example/Advection-Diffusion/AD_time.m	Thu Sep 12 14:43:23 2013 +0200
+++ b/example/Advection-Diffusion/AD_time.m	Thu Sep 12 14:58:34 2013 +0200
@@ -2,17 +2,14 @@
 # bim pkg:
 # http://wiki.octave.org/Bim_package#3D_Time_dependent_problem
 
-pkg load msh
-pkg load fpl
-pkg load fem-fenics
+pkg load msh fpl fem-fenics
 
-fem_init_env ();
 problem = 'Advection_Diffusion';
-fem_create_rhs (problem);
+import_ufl_Problem (problem);
 
 problem = 'Reaction';
-fem_create_rhs (problem);
-fem_create_fs (problem);
+import_ufl_BilinearForm (problem);
+import_ufl_FunctionSpace (problem);
 
 x = linspace (0, 1, 40);
 y = z = linspace (0, 1, 20);
@@ -29,13 +26,13 @@
  
 u = exp (- ((x-x0)/(2*sx)) .^2 - ((y-y0)/(2*sy)) .^2 - ((z-z0)/(2*sz)) .^2);
 
-V  = Reaction_FunctionSpace (mshd);
+V  = FunctionSpace ('Reaction', mshd);
 
 f = Expression ('phi', @(x,y,z) x + y -z);
 g = Expression ('mu', @(x,y,z) 0.01);
 
-a = Advection_Diffusion_BilinearForm (V, f, g);
-m = Reaction_BilinearForm (V);
+a = BilinearForm ('Advection_Diffusion', V, f, g);
+m = BilinearForm ('Reaction', V);
 A = assemble (a);
 M = assemble (m);
 
@@ -55,5 +52,3 @@
   delete ([name ".vtu"]);
   fpl_vtk_write_field (name, msho, {U(ii,:)', 'u'}, {}, 1);
 endfor
-
-

--- a/example/Biharmonic.m	Thu Sep 12 14:43:23 2013 +0200
+++ b/example/Biharmonic.m	Thu Sep 12 14:58:34 2013 +0200
@@ -1,30 +1,24 @@
-pkg load msh
-pkg load fem-fenics
+pkg load fem-fenics msh
 
-fem_init_env ();
 problem = 'Biharmonic';
-fem_create_all (problem);
+import_ufl_Problem (problem);
 
-x = y = linspace (0, 1, 32);
-msho = msh2m_structured_mesh (x, y, 1, 1:4);
-mshd = Mesh (msho);
+# Create mesh and define function space
+x = y = linspace (0, 1, 33);
+mesh = Mesh(msh2m_structured_mesh (x, y, 1, 1:4));
 
-V  = Biharmonic_FunctionSpace (mshd);
+V = FunctionSpace(problem, mesh);
 
 bc = DirichletBC (V, @(x,y) 0, 1:4);
- 
 
 f = Expression ('f', @(x,y) 4.0*pi^4.*sin(pi.*x).*sin(pi.*y));
-
 g = Expression ('alpha', @(x,y) 8);
 
-a = Biharmonic_BilinearForm (V, g);
-L = Biharmonic_LinearForm (V, f);
+a = BilinearForm (problem, V, g);
+L = LinearForm (problem, V, f);
 
 [A, b] = assemble_system (a, L, bc);
-
 u = A \ b;
 
-
 func = Function ('u', V, u);
-fem_plot (func);
+plot (func);

--- a/example/Evolution.m	Thu Sep 12 14:43:23 2013 +0200
+++ b/example/Evolution.m	Thu Sep 12 14:58:34 2013 +0200
@@ -1,15 +1,11 @@
-pkg load msh
-pkg load fem-fenics
+pkg load fem-fenics msh
 
-
-fem_init_env ();
 problem = 'Evolution';
-fem_create_all (problem);
+import_ufl_Problem (problem);
 
-msho = msh2m_structured_mesh (0:0.05:1, 0:0.05:1, 1, 1:4);
-mshd = Mesh (msho);
+mesh = Mesh (msh2m_structured_mesh (0:0.05:1, 0:0.05:1, 1, 1:4));
 
-V  = Evolution_FunctionSpace (mshd);
+V = FunctionSpace(problem, mesh);
 
 bc = DirichletBC (V, @(x,y) 1, 1:4);
 
@@ -21,8 +17,8 @@
 
 u0 = Expression ('u0', @(x,y) 10*exp(-((x - 0.5)^2 + (y - 0.5)^2) / 0.02));
 
-a = Evolution_BilinearForm (V, k);
-L = Evolution_LinearForm (V, k, u0);
+a = BilinearForm (problem, V, k);
+L = LinearForm (problem, V, k, u0);
 
 A = assemble (a, bc);
 
@@ -33,7 +29,7 @@
 
   # we can pass u0 to the lhs indifferently as a fem_coeff or
   # as a fem_func
-  L = Evolution_LinearForm (V, k, u0);
+  L = LinearForm (problem, V, k, u0);
   b = assemble (L, bc);
 
   u = A \ b;
@@ -41,5 +37,5 @@
   u0 = Function ('u0', V, u);
 
   #press Q to make the plot continue
-  fem_plot (u0);
-end  
+  plot (u0);
+end