Few improvements, renamings...