ENH: Make variable naming succint