refactored modules into more sane verbs
updated spec to reflect more sane verbs