Symbolize keys

Renamed and moved wrapper