Minor fixes for ID-occupied module, some interface and naming cleanup