integrate naming changes suggested by Gerd