FORGE-1267 Fix extraction of Id name from getters