Updated package and organisation name