Added fixes for customization template

Added fixes for customization template - this will get tests passing again, but a bug has been filed to revert the name changes