Rename classes to follow 3.x naming