class renamed to follow naming conventions