changes to Cell naming conventions