Corrected class / module names