Expand variable names for readbility