Change naming scheme a bit so that names won't duplicate as quickly