Navring changes for consistancy and cleanliness

Change-Id: I3c81ef52c14cfc9430d4a648d6b9b37dbd7c485a