Changed names of a few classes to be more mnemonic.