renaming and cleanup of interface