Update keywords to be more appropriate