GTNWCM-16-1 Renaming and refactory for wcm usability.