Typos & reositories & remove entity suffix & phing tasks