Finish rename from previous commit.