Consistently use strings to address keys