Various modifications before changing repo name