Navring changes for consistancy and cleanliness

Change-Id: Iaff63c6b7beb664149ddcd4066c673fc14384631