language changes: fixed warnings (#[cfg] and renamings).