consistent names
add prelim autoload script and clean up others