Fix code formating and wrong class name. Fixes #4551