improve build script, naming changes