Added name and keyword functions to core