Navring changes for consistancy and cleanliness

Change-Id: I45bcde7f6c5ae18d56f54d1444b790902b0448f2