More variable name shortening