changed up naming conventions a little