Consistently using strings instead of symbols internally