fix specs and small renaming