changed the names to match the renamed classes