Changed boilerplate names