Updates to use better names and native grunt methods