fixed naming so it was consistent and works with Processing