Code structure updated - class naming unified