got rid of %objectId% in whole package
some wedding refactoring
more occurences of "%objectId%"

also merged two constants
got rid of "%objectId%" from core
sorted the constants