some renamings because of camelcase problems