Change naming convention and fix git completion