second commit, some name changes