remove TODO
#58 property naming convention is not followed