Fix whitespace issues and case of class name
Rename helper file so it works on case sensitve file systems