Don't make same naming mistake again