Fix some names. Remove cache from version control.