simplified naming conventions a bit more