Updated packagedef to avoid keywords.