Changed the names to what they used to be, which will cause conflicts with ianbrandt's stuff but whatever.