naming fixes and spec fixes