refactored classes name

All now with a capital letter