Refactor annotation keywords