updated to new names
updated spec and added readme example
Merge pull request #4 from austiniam/master

updated names