CMS-2757: Ensure all package names referencing an app has no postfix - Refactored