changing module / library names to match changes in previous commit.