renaming and some build updates