[IMP] Rename class to use conventional camel case