Changed names of packages and directories references