Renaming to get consistent naming schema