Add delete definition method & rename method to simpler names.