Use more standard naming conventions