Variable names refined