renaming things to be cleaner and more consistent. fixes #22
renaming things to be cleaner and more consistent. fixing spec fixes #22
fixes #22 once and for all, i hope.