Table and extensions: More variable name improvements.