Remove first (old) implementation files
Remove useless namespace in method names
Improve spec readability