changed naming conventions on nav.