Updated naming convention and removed the NoRake variant.