Yes you should change all references that follow the pattern of:
table to tablesomething
TABLE to TABLESOMETHING

except for things that start with:
TABLE_

Example:
TABLE_CONFIGURATION

as those are database table references ...