changes template names and cleaned up classes