Some renames and issue #7.