Basic name changes, README update