Refactored module naming to following new standard