Made some minor changes (mainly renames) during spec write.
Moved abstract impl class to RI.