Updated to common convention