LPS-47050 use shortened namespace as discussed