Fixed naming conventions