some renaming and specs.