I agree that it is confusing, but I'm in favor of renaming things later.