WPMVCB-6 Remove leading underscores #resolve