Renamed class name and file name to follow cubex Conventions