Renamed memory entries to make them more consisten