Renaming of files and JS member name for clarity and consistency. Purely cosmetic