Package 0.2dev - Renamed classes