Fixed names, added destructors