Changed constructor and deconstructor names