New nav naming

Also, H style cleanup