Names changed for blackberry support.