use alias format for table names
Merge pull request #2928 from gonimar/patch-13

use alias format for table names