revert stage4 to consistent naming scheme and add exception for openvz