Making keywords consistent