Renamings, refactoring, new specs-project