Naming & Path fixes