refactored module app names for pluralization, consolidated methods