part #2 of renaming. forgot some source files, too