Completely refactor nave aliases.