name refactoring and spec fixing