Further class name amends