Removed w2 postfix from all functions and module names