Standardize table naming