Lots'o renaming

Making things clearer.