Changing more ID's to Classes

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>