update for better naming convention