Soc2014 meta refactor upgrade

rq? res? please use better names.