fixed names and bump base