diff --git a/vcg/complex/trimesh/closest.h b/vcg/complex/trimesh/closest.h
index 2bde5080..e90a5a0f 100644
--- a/vcg/complex/trimesh/closest.h
+++ b/vcg/complex/trimesh/closest.h
@@ -247,7 +247,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			VDistFunct fn;
 			_minDist=_maxDist;
 			Point3x _closestPt;
@@ -263,7 +263,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vert::PointNormalDistanceFunctor<typename MESH::VertexType> VDistFunct;
+			typedef vcg::vertex::PointNormalDistanceFunctor<typename MESH::VertexType> VDistFunct;
 			VDistFunct fn;
 			_minDist=_maxDist;
 			Point3x _closestPt;
@@ -291,7 +291,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);			
-			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			VDistFunct distFunct;
 			return (gr.GetKClosest/* <VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(distFunct,mv,_k,_p,_maxDist,_objectPtrs,_distances,_points));
@@ -326,7 +326,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			VDistFunct fn;
 			return (gr.GetInSphere/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(fn, mv,_p,_r,_objectPtrs,_distances,_points));
@@ -424,13 +424,13 @@ namespace vcg {
 		};
 
 		template <class GRID,class MESH>
-		class ClosestVertexIterator:public vcg::ClosestIterator<GRID, vcg::vert::PointDistanceFunctor<typename MESH::ScalarType>, VertTmark<MESH> >
+		class ClosestVertexIterator:public vcg::ClosestIterator<GRID, vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType>, VertTmark<MESH> >
 		{
 		public:
 			typedef GRID GridType;
 			typedef MESH MeshType;
 			typedef VertTmark<MESH> MarkerVert;
-			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			typedef vcg::ClosestIterator<GRID, VDistFunct, VertTmark<MESH> > ClosestBaseType;
             VDistFunct fn;
 			ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,fn){}
diff --git a/vcg/math/random_generator.h b/vcg/math/random_generator.h
index 620f61e6..b45e4dcf 100644
--- a/vcg/math/random_generator.h
+++ b/vcg/math/random_generator.h
@@ -75,4 +75,4 @@ public:
 } // end namespace vcg
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/vcg/simplex/vertexplus/component_ocf.h b/vcg/simplex/vertexplus/component_ocf.h
index 4ae8959d..211c79db 100644
--- a/vcg/simplex/vertexplus/component_ocf.h
+++ b/vcg/simplex/vertexplus/component_ocf.h
@@ -557,14 +557,14 @@ namespace tri
 	template < class, class > class TriMesh;
 
 	template < class VertexType, class FaceContainerType >
-    bool HasPerVertexQuality (const TriMesh < vert::vector_ocf< VertexType > , FaceContainerType > & m) 
+    bool HasPerVertexQuality (const TriMesh < vertex::vector_ocf< VertexType > , FaceContainerType > & m) 
 	{
 	  if(VertexType::HasQualityOcf()) return m.vert.IsQualityEnabled();
 	  else return VertexType::HasQuality();
 	}
 
 	template < class VertexType >
-	void ReorderVert( std::vector<size_t>  &newVertIndex, vert::vector_ocf< VertexType > &vertVec)
+	void ReorderVert( std::vector<size_t>  &newVertIndex, vertex::vector_ocf< VertexType > &vertVec)
 		{
 			vertVec.ReorderVert(newVertIndex);
 		}