Update template code and docs for new naming convention MKWS-294