made naming conventions consistent