Changing to appropriate name