renamed files and objects to better support auto-compl