Change the keywords to be more appropriate