Specs passing, slight renaming