Change name of classes to something slightly more specific