rename layers stuff almost done