correct some initial naming mistakes