Minor renames and get of additional field in accounts