Fix wrong object names