Rename columns and methods to avoid potential confusion