Removed more - in variable names