added logic to build for if rename required