Used better naming convention