Update and rename EmptyCell to EnergyCell