[skip ci] refactor property names to sthing more meaningful, better error checking