update for static naming convention