Rename init functions for consistency