Rename spec
Clean up some specs and code