More renaming
Version bump to 0.4.0