Initial rename to make things more generic