moved new naming to the right place