Slight package and function renamings for simplification