Update and rename osxi to osx