simplification
renamings to fit better current concepts