Cleaned up naming convention (PascalCase instead_of_underscores)