Changed statics to uppercase