Removing duplication on class naming