Refactoring class names, qualifier name. Added VertexFilter.