revised naming accorind to comments from Kurt