Renamed specs for better reading

Checked 100% coverage and doc
rebundled