general clean and renaming of sales building functions.