optimized naming conventions a bit