Change naming to allign with optware